From 5a83787dc0315df426f4ee5aae0b1068abb58449 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Mon, 29 Feb 2016 10:43:12 -0800
Subject: [PATCH] Update CSS nodes documentation

---
 gtk/gtkscale.c     | 25 +++++++++++++++++--------
 gtk/gtkscrollbar.c | 19 ++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 3caecb7037..ab49746342 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -79,20 +79,24 @@
  * scale[.fine-tune]
  * ├── marks.top
  * │   ├── mark
+ * │   ┊    ├── [label]
+ * │   ┊    ╰── indicator
  * ┊   ┊
  * │   ╰── mark
- * ├── trough
- * │   ├── slider
- * │   ├── [highlight]
- * │   ╰── [fill]
+ * ├── contents
+ * │   ╰── trough
+ * │       ├── slider
+ * │       ├── [highlight]
+ * │       ╰── [fill]
  * ╰── marks.bottom
  *     ├── mark
- *     ┊
+ *     ┊    ├── indicator
+ *     ┊    ╰── [label]
  *     ╰── mark
  * ]|
  *
- * GtkScale has a main CSS node with name scale, and subnodes with names
- * trough and slider.
+ * GtkScale has a main CSS node with name scale and a subnode for its contents,
+ * with subnodes named trough and slider.
  *
  * The main node gets the style class .fine-tune added when the scale is in
  * 'fine-tuning' mode.
@@ -105,9 +109,14 @@
  * there is a subnode with name fill below the trough node that is used for
  * rendering the filled in part of the trough.
  *
- * If marks are present, there is a marks subnode before or after the trough
+ * If marks are present, there is a marks subnode before or after the contents
  * node, below which each mark gets a node with name mark. The marks nodes get
  * either the .top or .bottom style class.
+ *
+ * The mark node has a subnode named indicator. If the mark has text, it also
+ * has a subnode named label. When the mark is either above or left of the
+ * scale, the label subnode is the first when present. Otherwise, the indicator
+ * subnode is the first.
  */
 
 
diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
index 0f4ca11291..27c9c7f701 100644
--- a/gtk/gtkscrollbar.c
+++ b/gtk/gtkscrollbar.c
@@ -57,17 +57,18 @@
  * # CSS nodes
  *
  * |[<!-- language="plain" -->
- * scrollbar
- * ├── [button.down]
- * ├── [button.up]
- * ├── trough
- * │   ╰── slider
- * ├── [button.down]
- * ╰── [button.up]
+ * scrollbar[.fine-tune]
+ * ╰── contents
+ *     ├── [button.up]
+ *     ├── [button.down]
+ *     ├── trough
+ *     │   ╰── slider
+ *     ├── [button.up]
+ *     ╰── [button.down]
  * ]|
  *
- * GtkScrollbar has a main CSS node with name scrollbar, and subnodes with
- * names trough and slider.
+ * GtkScrollbar has a main CSS node with name scrollbar and a subnode for its
+ * contents, with subnodes named trough and slider.
  *
  * The main node gets the style class .fine-tune added when the scrollbar is
  * in 'fine-tuning' mode.
-- 
2.30.2